Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 13 Jun 2010 09:38:33 +0000 (09:38 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 13 Jun 2010 09:38:33 +0000 (09:38 +0000)
commit5456fce37dd503b7e43ebc2ff6886d23256380c9
tree92232b6995561757b4055a4bbce5757b02efcabe
parent5981ed601504a8c2ea67db72d850f19d87f00374
parent37f5b158c9664beb9d4047350d2ec819f8f1a6b3
Merge from mainline.